From: Jan Tojnar Date: Thu, 9 Apr 2020 20:25:32 +0000 (+0200) Subject: build: Install keybindings relative to our datadír X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~491 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e240f7ea593f06ae2b3d7171e65d67c057ad9f62;p=gnome-shell.git build: Install keybindings relative to our datadír It is a good practice to install files relative to our own variables https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ and it is required on systems like NixOS. --- https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 --- diff --git a/meson.build b/meson.build index 052a2d72b..b5a4d1c00 100644 --- a/meson.build +++ b/meson.build @@ -72,7 +72,7 @@ systemduserunitdir = join_paths(prefix, 'lib', 'systemd', 'user') keybindings_dep = dependency('gnome-keybindings', required: false) if keybindings_dep.found() - keysdir = keybindings_dep.get_pkgconfig_variable('keysdir') + keysdir = keybindings_dep.get_pkgconfig_variable('keysdir', define_variable: ['datadir', datadir]) else keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') endif